Improve naming and make some methods simpler