Added 6 new blocks and cleaned up code