making code slightly cleaner (WIP)