cleaned up code style