Cleanup up code