- cleaned up code