Better naming, removal of unnecessary functions.