Cleaned up handlebar code