Cleaned up whitespace, definitions
Added interactive mode