Cleanup

code cleanup from spoiled milk