Cleanup code style :dog2: :shit: