Refactored out some logic for keywords and added in preliminary RUN
support.
Style fixes