Removed some warning and comments