More formatting
fixed compilation bugs and formatting