Implemented review comments related to code cleanup