Fix whitespace.
Note to self: Reduce nasty copy & paste habits
Organize imports. Improve annotations, use better variable names.
Streamline validations at startup