Cleaned up code, added a couple of comments and changed modification dates because ??