cleaning up code style