Added option to set block size of cipher, refactored and cleaned up code in main