Coding conventions and bug fixing