removed useless setting entry
cleanup, added comments in order to explain what methods do