A bit cleaner
Workable for now