Stylistically awesome adjustments
Merging things
validation stuff