name changes
better comments and naming convention
comments and naming