Clean up method definitions

I tried to group of Chemical class topically. Also, renamed some of them to
make applied naming convention more consistent.