cleaned up code syntax