Incorporated the suggestions @Gudatt made