Code style and bug fixes