Naming conventions; Added null checking to cleanup methods