Refactor

Added support for blank lines and extension methods.