Code cleanup

Just cleaned up some code.