Removed boilderplate code