Cleaned files to follow coding conventions.