Cleaned up some code, added something.