Code cleanup + minor highlighting fix