Cleaned up code style slightly