Reorganize method structure a bit