Working Setup creation for only one step

Also re-indent code to match PSR-2 on Setup files.