Issue #1 - Coding style is now consistent.
It may not be nice, but it's consistent!