Code Structure and minor Changes