Making some basic changes just because I really should do something