fixed naming
cleaned up code