Refactor / cleanup molecule container

Reorganize structure of the file to make it similar to other classes,
use camel case notation, remove unnecessary function calls.