Restructuring and putting it in more formal way