Cleaned up some magins