code cleanup and coding-standardization
removed *.orig file