More pricing stuff / calculations + some cleanup