Cleaned up some code inconsistencies
Version 0.5.10