Removed more boilerplate!