Cleaned up code a bit, & Added ClayLogger