some clean up from resolving #175
some clean up from resolving #175

jamoma/JamomaCore,jamoma/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore