180 warning fixed. Code clean up.