Moved status into another module. / Misc Cleanup

Moved status checking into another module.
Cleanup of other functions.