Cleaned up code syntax some more