Cleaned-up a few things. Playing around.