Cleaned up init()