:bath: cleaned up code structure