Code Cleanup after review