Removed boilerplate code