Cleaned up some code syntax