Cleaned up a few unneeded decencies

Also simplified some logic in the code.