Small changes for better coding
Updated with more notes!