Further cleaned up