clean up
Merged with gui changes
fix style indentation changes