1494 | Akash/Subhas | Cleaned up existing code