Cleaned up some code, fixed signess warning. Removed retvalue code for now