Code Cleanup

Bug Fix;
Added a todo in the setup for @aspirinonfire as comments directed to
alex