Cleaning up code + comments,