Cleanup; Small potential Bugfix