Easier to read code, more input tweaks