Cleanup & not hardcoded