More refactoring/removing hardcoded stuff