stellartortoise Cleaning up code... just a little bit