Cleaning up + comments