Refactor some basic stuff