Small methods cleanup, more squishing