Cleaned up objects and methods