Cleanup + Added Pre-Req Checking