Made some changes suggested by catkin_lint and did some package cleanup