cleaning up code up until Main.cs