tried to clean up (I will remove these commits later, simply testing)