Slight refactoring, finalizing users