Code Restructure => Add Comments and Types