Changed size and cleaned up