-cleanup
-added style