Cleaning code, simplyfing setup