making it a bit more proper