Neated up code.