Refactored Coding into a clean pipeline and adjusted some parts