Cleanup + comments here and there