created private methods where possible, renamed a few items
more renaming