#27 - Cleaned up some code