Commenting & clean up <3