Cleaned up more code syntax