Breaking apart bigger methods, general cleanup