Formatting; Javadoc improvements; Removed traffic lights for now