Completely finished code clean-up