Took out unnecessary coding artifacts