Cleaned up code
Initial round of Jan Jan changes