cleaned up & beautified