Cleanup: General cleenup of code