cleaned up code styling