Cleaned-up some code