Removed multiple transfer sizes and cleaned up code