Moved the Stage enum to separate class. Some minor code clean upand commenting for consistency and clarity.