Cleaning up the code

Change-Id: I532a07c2a34b76145d1bc0d6e1a11a471a49f817