cleaned up the code style