added keywords and removed unused logic