changed style to be more functional and less bad