Cleaned up code standards