Configured repository on mac & code tidy