Cleaned code; updated vars names