Cleaned + wrote actual comments