- Cleaned up some parsing logic (removed locals etc) - Removing line continuation errors cleaned up code duplication a little bit