Changed to a more minimal code theme