Added extra customization options and cleaned up

Added extra customization options and cleaned up some of the code
indentation to make it more easiliy readable.