Simplify

All in one file and more clear instructions