Removed compiler warnings and minor code comment changes