Final (hopefull) code clean up