Removed bilerplate code