Clean up and fix code issues