ticket:23 Cleaned up a little