Bug fixes and style refactoring