Move around class block to increase readibility