Cleaned up redundant code.
Fixed few issues.
Dammit, I hate nameplates...