Cleaned up creating objects