Cleaning this up a bit

cleaning this up a bit