Fixed auto styling errors, more clean-up