Cleaned up code a small smidgen