Refactoring day

by day i mean morning.