Manual refactoring sux :S