suggested fixes and remove semis cause i iz nice