Clean up for code conventions & add some comment