Removed some redundant stuff + some fine tuning