Made it neat and clean