Cleaned up a little bit ...