Adding comments
Probably some cleaner code