Cleanup + added comment to headerfile