made some formatting changes to the top of mainjs
finished basic formatting, just cleaned stuff up
merged formatting stuff