cleanup and improved ruby highlighting