Add comment, alphabetical order in CMakelist and remove new lines