Simplified the init (still wondering if it's needed at all)